Let's make all the changes I posted above for the ActiveRecord test here as well.