Fixes #288 #289: Imported tests fron #289 to verift #288 is already fixed.