[Wikitech-l] Using composition to improve testability?