Start fixing tests
Remove now-unused files