Added tests for the Conditional VP Calculator