some testing fixes