More changes to make code more testable