Remove old test file that snuck in
Some more minor changes + refactoring