Add tests for #216