docker image + better tests