Part one of changing the test sim to match the new specs.
Last part of switching the sim over to the new specs.
Oops, missed this bit in the last commit.