Ctd cleanup and test#38

surgura merged 10 commits intodevelopmentParcels-code/virtualship:developmentfrom

ctd_testParcels-code/virtualship:ctd_testCopy head branch name to clipboard