Improve testability