Merge "Remove hard-coded Object class from test 980"