Tests; TEST_MODE; function renamings