Hotfix/better factory usage

A little bit of test cleanup, using factories where we weren't before.