Slight rollback, tests pass again