tests and fixes on scale