Improved helpers, more aidir specs, realized I'm using the old rspec syntax :(