* allow both singular and plural versions of nouns * use command table for client creation * cleanup * simplify docker mock * add docker to test requirements; clean up existing requirements