Another round of fixing namer/typer issues and adding tests