Added some tests
Fixed scale