Fix tests!