Completed classes and rspec tests