Better testability