Store refactoring to remove unnecessary method. Fixed test run