better test hierarchy and add scaffloding for trip test