some more changes to testing stuff