Tests: improve readability