Undo format change for unstranded cases
Add new stranded test cases