some changes to testing