fixing bad test for #622 #620 #617