Make the code and especially the test case leaner.