Add in testing around tests