Starting work on golden master/black box test thing