move some tests around to be more logical
Merge pull request #1076 from reaperhulk/test-location-fix

move some tests around to be more logical