Added testability