Fix tests

All green for me now.