[test] returned back to suite
[comparator] better function names