fixed all tests but 2'