[UPDATE] Testability changed, minimal set