Restructured rspec tests for better readability