Changed the config of aliases to helper method
Finished cleaning up alias setting, added more test coverage