includes 380a5 from master. sorting tests written