Hotfix/better factory usage

A little bit of test cleanup, using factories where we weren't before.
This redactor just obfuscates what you want to test. If we don't think its worth testing everything, but its worth spelling out the test.