Fix ActiveRecord specs
Merge commit 'e3c3ddcaf36fbacee80f7aeb894b38ae84ffe4c1'