Updated test data to accomadate the changes.
Updated tests for aliases.