BS-11777, fix unit tests for java 8, (list order issue)