Fix #942
Update tests for #942