Updating functional tests to use shunt, refactor and release of was as CLIunit.