improved testing!