Added test code
Merge branch 'master' of github.com:urbanexpression/catalog