Minor changes to TestedTrek, added MessTrek

CHANges to TestedTrek to make code look a little more like MessTrek
while still allowing tests to pass.