Request: improve class testability