Fix tests to work