reshuffling tests
Merge pull request #1871 from sebv/test-step3

Test reformatting 3, moving tests around.