several changes regarding testing