some changes made to testing