Restructure - fixed mocked test