More test tinkering.