new testing fixes