refactored new peep tests, on with styling.