Move the tests back in with its companions
pytests not working. Will look into
Merge branch 'master' into tests
Move the tests.
py.test was picking up a lot of noise in the project root.
fix filepaths
cleanup
pathing