fixed subscription/tests