Add tests for #82