Add tests for #3