Bug 18292: Remove return 1 statements in tests