Refine feature tests

- Refine feature tests.