Better command defect localization
Extract TestThread
Fix #27: Unify commands declared for groovy and groovysh