Cleaned up RSpec tests