Added a test + fix so the waitlist removes invalidated subs.

For #501