Minor cleanup // added some positive response tests

Nothing fancy, see commit comments