diff --git a/tests/issues.cpp b/tests/issues.cpp
new file mode 100644
index 0000000..387b083
--- /dev/null
+++ b/tests/issues.cpp
@@ -0,0 +1,34 @@
+#include "catch.hpp"
+#include "optional.hpp"
+#include <type_traits>
+
+struct foo{
+    int& v() { return i; }
+    int i = 0;
+};
+
+int& x(int& i) { i = 42; return i;}
+
+TEST_CASE("issue 14") {
+    tl::optional<foo> f = foo{};
+    auto v = f.map(&foo::v).map(x);
+    static_assert(std::is_same<decltype(v), tl::optional<int&>>::value, "Must return a reference");
+    REQUIRE(f->i == 42);
+    REQUIRE(*v == 42);
+    REQUIRE((&f->i) == (&*v));
+}
+
+struct fail_on_copy_self {
+    int value;
+    fail_on_copy_self(int v) : value(v) {}
+    fail_on_copy_self(const fail_on_copy_self& other) : value(other.value) {
+        REQUIRE(&other != this);
+    }
+};
+
+TEST_CASE("issue 15") {
+    tl::optional<fail_on_copy_self> o = fail_on_copy_self(42);
+
+    o = o;
+    REQUIRE(o->value == 42);
+}
\ No newline at end of file