Fix tests to pass