Improved test a little bit.