Add tweaks in Create Machine Test