Working towards rest of WhenAny tests building