Fixed one test (still need revision)