* improved testing