Rename test files back to convention
Use bundler
Rewrite tests to use specific assertions

TODO: split up huge tests