Updated rspec tests, cleaned up markup