Annotate test fixed.
Moved pseudo-factories into test_helper