I have split tests for conversions from uptional<U> and from U to optional<T>. I have split the optional refs tests that are expected to pass on all compilers. I started using lightweight_test instead of Boost.Test (now only in some files).