Cleanup test class since we are no longer using supermodel