passed all tests except 2 file related ones