minor improvement to unittests