Add tests for a large class hierarchy