Push out some [broken] masher tests
Rename some stuff to try and figure out the db session weirdness.
Some refactoring and cleanups to the masher test suite
Masher test suite fixes