cleaned-up alias-map tests + other minor fixes