tests revamped to match predict changes