Partial fixed tests (still not working)