Bug fixes, tests
Ignore test for now
Remove extraneous file