Add test to ensure Rental::upcoming_* methods all return same info
Merge branch 'rentals'