make tests independent and fixes a bug when enabling / disabling non-existent features