Add tests for #286
Add tests for #286