Fixes incorrect tests 16, 17 in issue #429