Broke and fixed tests