Wartop: Test fixes

More fixes and additions for a new system