Sort all the smokey tests
Move popular tests into specific domain files
Resolve smokey test failures
Resolve mapping capitalisation to fix tests
Merge pull request #839 from rjc123/fix_tests

Fix smokey tests