Aliases to aliases is a bad idea, revert.  Added better tests to show unused aliases