Also addded a couple more tests Updates #14756 Signed-off-by: Dave Tucker <dt@docker.com> Upstream-commit: c5667bc5690d6004db4e515cef1865e093da7e3b Component: engine