Sync two remaining test cases after merging unstable. Fixes #758