removed aliases from the test
Merge remote-tracking branch 'origin/alvaro' into alvaro