Refactored and created tests for aliases in model names