Fixed more tests