Cleans up tests and fixes subscription bug