Position and Plotter tests, refactoring and reorganizatin classes.