Minor refactoring
Fixes points being returned not according to the scale value
Hides increasePoint from being exposed as a public interface
Adds tests for model