Could you please rename the test cases meaningfully and structure them appropriately to respective test packages?