use const for default port mapping type
more cleanup + update test