add more NEST tests, speed up ScaleMap a bit