Fixed up some tests, broke others :P