Minor cleanups to classmap tests