remove unused files from tests
fix broken tests