DEVIDM-116: Avoid NPE
DEVIDM-116: Moved common stuff to super class
DEVIDM-116: Adjusted to new flow objs
DEVIDM-116: Adjusted tests to new flow command objects