Remove unnecessary test helper methods