Added Test for aliases.
Changed file names to be more systematic.