Added more refined and DRY tests in rspec