Beef up unit tests for SI95 code