Update base to be testable