Small refinements in tests