Trying to resolve unit test issues