More user tests, fixes to Arcadia code.