modified certain files and all tests