rails4 related changes to tests