add back extended tests.