Spec environment updated
Fix specs which were not failing when expected to
Update monkey patching to work with ActiveRecord 4