Cleanup Tests

On top of #1, this also cleans up the test files a little.

Let me know if you want me to rebase this onto your master (in case you want to review them independently).