improvements of tests