consolidate test files

review please @sebv @imurchie 

(i ran all the tests, they still pass)