More refactoring and testing in the same classes
Merge branch 'cmd-visitor' of github.com:schubergphilis/CloudStack into cmd-visitor