Added docker unit test, docker flag and fix issues found