Cleanup, added convenient test files