Override tests to be run with TEST_FILE
Passing tests, still a little rough around the edges