Fixes and tweaks in create machine tests