Touch up a couple tests