small testability improvements