Code style improvements (passes rubocop checks 100%), use rspec expect syntax