Improve testing and tweak docker capabilities