Merge "Add Count Class Instance API Tests" into main