Incorporate EntryDisc into machine, machine tests