More tests taking scaling into account