Updated tests to match java-core changes for issue #328