First stab at updating the tests