Separated make config from Makefile.
Fixed TestActionWrapper.__init__.
Fixed TestCliDispatcher.
Updated tests.