Fixed tests to support new updating of machine models on creation instead of destroying