Added unit tests for Scheme and Catalog