Add Uname.machine
Add Uname.nodename
Fix test