Moved tests. Added expired notification test