add tests for expiring message removal and never expiring message removal