Fixed a regression on CTR-123 that was preventing aliases, etc. with special characters from loading.  Improved the tests this go around.