Cleanup: Remove unnecessary dash escape when building docker container name

We don't need this dash escape since they are not valid name for Container and Pod. Modified test to reflect the changes, and also removed two test cases since they are not allowed in the system anyway. 
We should use _ as the separator - it's not allowed in container names.