Slightly better type annotations and naming in Tests.Machine