minor testing changes

still have a few more things to go before the big merge