This simplifies the tests a little bit, maybe it will be more robust??? Also seems like a useful thing to do anyway.
