Some more CompUnit tests
Some more S17-supply tests, more to come