Fix tests

now they all pass, ye!