Added rspec support to Spring
Refactored to make sessions more manageable