major revisions to testing setup