Changes according ztest interface change