Some fixes on tests removed try catch
Machine State