Work on making code testable