Fixed tests for issue #735