Started writing the port first. It does not matter but it's easiest to fix the unit test.