bugfixes in rspec and ispec