Finished test helper stuff and wrote a test with it