Update tests for issue #357