Fixed set default test options for VOS
Simplified killing virtuoso test instances
Fixed use $MAKE