more testing fixes