Yay, more tests fixed