Test some improvements.