Made substantial change for unit test