VX(Li): Refactor the test categories.