Active Record Support and Rspec fix