Extended command definition and parameter definition resources and
improved testing.