deleted two files and modified all tests