Tests corrected according to code changes.