Fixed tests to fit latest changes.