Adding a prefetch test for models using aliases
Removing items from todo