Add tests for #59