Split clustered tests to more detailed test cases