Improve testing and testability
2 files changed