Merge "Dockerize the test enviroment"