Remove a duplicated assertion from a test
Refactor tests a bit
Test that scheduled messages are intact
When delivery is scheduled in the past, deliver immediately