Fixed specs broken by branch splitting
ActiveRecord 4.0 support