Resolve broken unit test