edited file structure and finished all 41 tests