Fix tests so they pass.