RFR: 50: Fix failing tests after e8d32c78dc

[Erik Duveblad via github.com]

The pull request has been updated with additional changes.

----------------

Added commits:
 - c8fca3b2:	Incorporate suggestions from Robin
			Co-Authored-By: Robin Westberg <robin at westberg.se>

Pull request:
https://git.openjdk.java.net/skara/pull/39

Webrevs:
 - full: https://webrevs.openjdk.java.net/skara/39/webrev.01
 - inc: https://webrevs.openjdk.java.net/skara/39/webrev.00-01

Updated full patch:
https://git.openjdk.java.net/skara/pull/39.diff

Fetch command:
git fetch https://git.openjdk.java.net/skara pull/39/head:pull/39