The tests for java.util.Optional are somewhat disorganized and are hard to maintain. The assertions for empty and present Optionals should be gathered into common methods, and the tests for the various Optional factories and operations should be rearranged to use the common methods.