Added new object classes and rspec test cases