Hotfix/better factory usage

A little bit of test cleanup, using factories where we weren't before.
This is the profile spec, so it makes sense to use the profile factory here.