Changed test. Conflict?