Adding RSpec integration and providing a better organization