Adding minimum unit-tests... need to come up with something to test real flows