Add tests for #1
Close #1