Sort all the smokey tests
Move popular tests into specific domain files