Minor test cleanup

@wedaly or @jzoldak, can one of you take a look at this?