Refactor tests

Nothing fancy here, reduce some string verbosity is tests, prefer .build to reduce DB hits and some minor styling updates