Lints
Rspec fixes