refactored for clarity
added reminder message tests