Add in choice core skipper tests