Fix tests to pass them.