Fix to be testable