added test
removed redundancy in fallback machineId
count up version