Some changes to testing