Minor testing fixes