Add sleep time to rspec tests + General Improvements