More testing fixes