rails4: fixing first issues

Trying to fix some issues. But, apparently, there are fails that are
failing in combination but passing if run separately.