Refined more tests.