Some test cleanup

Nothing very exciting... just making things a little more consistent