fixing rest of tests