Refactor

changes some tests to use `.fixture()` and removes some annoying `msg = {` etc..

cc @calvinfo @gjohnson