Fixes to pull_request test after the class updates