Rspec - Academic Session+minor fixes