More Rspec; Bug fixes