Resolve failing unit test