Switch mtr

Switches us over to MTR plus adds some neato tests