Fixed some issues with test_handle_class_5