fixing tests
fixing problems
lost files
fixing more problems