Improve readability of test code