removed uneccessary code, loggin, and refactored unsubscribe tests