Merge "Add moon feature tenant testcase"