Make things a bit more maintainable
Use rspec now