Added test for re-selecting machine when updated