Fix those tests!