testing fixes