Fixed scaling issue and deprecated old method plus added comparative
unit tests