Split out testing tasks a bit more