Merge "Add tests for class names in the api main and query module manager"