Some minor changes and clean-up #3770

Job	Run time
Integration Tests (Java 11) (mongodb)	1h 36m 38s
Integration Tests (Java 11) (hsqldb)	1h 27m 45s
Integration Tests (Java 11) (monetdb)	1h 17m 40s
Integration Tests (Java 11) (postgresql)	1h 17m 21s
Integration Tests (Java 11) (file)	1h 17m 21s
Integration Tests (Java 11) (cottontail)	1h 36m 40s
Integration Tests (Java 11) (neo4j)	1h 36m 6s
	10h 9m 31s

Provide feedback