Add unit tests for positions; Change model