Refactor of Code for Test Purposes I