Got first tranche of tests to all pass