Merge "Remove dummy plan and test"