updates to tests
Merge branch 'andrew' of https://github.com/jeche/OPS into andrew
Merge branch 'andrew' of https://github.com/jeche/OPS into andrew
nettest code added