Add some more test models & separate WMO groups