Improved test a tiny bit