Test improved