Rspec - Intake+Minor fixes