Ooops...forgot to commit test cases for #897.