added psubscribe with timeout and updated tests