improved tests 2125063