Update to use dictionary style string formatting and ensure full test coverage