Making changes for unit test to be simpler