Further improved test