trying to make the changes I made more testable