wip(test-cases): Improve performance of test cases