Fix machine tests