Fix broken tests + separate metrics out
Fix broken tests + separate metrics out

Also use UnitTest-specific asserts; they're much nicer when things break.

fg-inet/sdnctrlsim,fg-inet/sdnctrlsim,cryptobanana/sdnctrlsim,fg-inet/sdnctrlsim,cryptobanana/sdnctrlsim,cryptobanana/sdnctrlsim