Bug fix and rspec add