Clean up code in analyseTestSt
Merge branch 'develop' of https://github.com/Wickfish/DBSDetector into develop