fixed map ordering issue in tests