making the testing changes as requested by @schwern