Need test refinements

- move validation tests into separate context block for clarity
- add explicit setup blocks to context blocks to make dependencies more obvious
Add FactoryGirl syntactic sugar

This makes the create statements shorter