improved tests.