Fixed up some alias formatting issues and associated tests