KNOX-280: More tweaks trying to stabilize unit tests.