Ensure id is always primary key
Eliminate RSpec deprecation warnings
Serialize date objects properly