Added slight improvement to the tests