commented out lines removed from the test
Merge branch 'devel' of github.com:mgcam/npg_tracking into devel