Fix pessimistic dependency on rdoc and rspec
Update deprecated syntax