synchronize tests with master
change category order