Fixed spacing issues
Added tests for catalog and refactored code for servicecatalogs using fixtures