fixed up some tests, moved to _tests/