Fix to allow single feeds, home or away feeds, or both
Simplify tests