Test cleanup

@tamird Minor test cleanup. Doesn't make it green, but makes it less red.