Enhances features of docker classes and its testing