Remove unnecessary parent class; fix test