Fixes correct yes and no translations.
Mock is deprecated use double instead.
Cleanup Rakefile.
Revert for less impact when rebase upstream.
Add class_name to harden association.