Update initializers and rspec