Added city field to registration tests.
Added search tests.
Actually added search tests this time...
Merge branch 'clomax/test'