nonlinear VAST xml is contained in linear
Fixed problem with seemingly random failing of tests
Initial wrapper tests with fixes