AMO stats test cleanup