several changes to the testing setup