Fix for #1682: alias of outer class
Test for #1682: alias of outer class
Added header to test for #1686