Tests almost passing again