Update dockerfiles and makefile tests