Adapt for 2.0.

Use mutators as the test, instead of testing using the staged_joins
facility.  In the future, we should probably try to keep this more
up-to-date.

@engelsanchez