Improved test #7 #14