Fix tests for inheritance support