Split class definition test into two