Update tests for issue #359.