TESTS: cosmetic improvements