- Refactored InMemoryFunctionCatalog and BeanFactoryFunctionCatalog into common catalog implementation - Added initial test Resolves #261