moved the tests around fixed relative import paths blah et blah