Minor fix to #426 unit test (problem itself still persists)
Add unit test for #650
Add test to verify #647