Fix tests for altered class