Wartop: Test fixes

a few additional fixes for a new test system