Properly integrate CLI domain tests with CLITestSuite