fix tests to reflect analysis changes