Refactored tests + new test for subscriber persistance
A file was renamed but I messed up the commit