#240 Improved readability of unit test