- [TESTS] slightly improved test routines