fix the rest of tests