Fix test locations
Add test #691
Extend test #691
Add imports #691
Add test
Merge