Tests of basic-functions improved