Issue #698: Fixed tests