more tests on scaling, fixing a few issues with exceptions