Various cleanups to make the test easier to grasp:
* Use Set.of
* Don't use catch(Exception) (fail(e.getMessage()) construct but let
JUnit handle it properly
* Use assertEquals/assertNotEquals to simplify reading