pretty things up and fix test