Move alias tests to separate function, add some commented out todo tests